Updated Grunt to Shunt