Add the GA & Fix the makefile error