changes made per comments