REFACTOR IT!!!
Bugfixing