Replaced GA code with new structure