Reverting back to subquery thinggy