Optimised and improved version of grunt