Added more switch stuff, removed SYN_SENT1