Updated GA code again