Added nested shunting.