Renamed some of the behaviours and added some more