Updated sandwich controller