Updated grunt behavior