add GA and update ordering issue