Added "onoff" behaviour (square wave) and normalised sine.