further grunt improvement