fixing up the behaviors