fixes according to some comments
didn't save
update function to  "preferred" method