Refactoring, and implemented splash tower