ga removed; cpa added; router refactor