Added switch on status