updated to run at switch under passenger