Modify controller and fitbit model