2D simulation plot functions fixed, switching not fixed