MAJOR fix to binary switch, testing code was NOT removed