Refactoring
Revert "Refactoring"

This reverts commit d433f1fa703da8f790eacc1797cf4edb59c0490c.
work
Fixing bugs