On off switch

merges the branches