add GA and fix bug