Fixed #12 -- all the grouping middleware removed!