Added fade to on/off