GA fix + refactoring