Directory changes. Removed group_by near bottom.