lnguyenh Changes after user feedback