added code to deal with lightswitch
switch order of turn on