More updates to the grunt section