total refactoring :)