Major bug, should work switiching between modes now