changed some of the behaviours I did not like