Merge "Updating comments on cow layout" into main