Added tap to turn off