move swap on/off variants into same file