re #33 Updated controller functions to use behaviors.