Added behaviours

reformat code, untested