Not doing CGA anymore ;_;
Refactoring to function calls