Changed grunt structure