added back the on and off states