(should be the) Final fix to killswitch section