Trying to simplify things...
Trying...
Done refactoring