changes to iso switch decoding