crazy space refactoring..