Finished Implementing GA support