Added switch to stay on.