Fixes. Now it works.
Refactoring