fixed activation issue, littlerefactoring
fixed the switch function!