Final modification for grunt use