Improved shunting