GHJoin finished and Aggregate rewrite