Refactored Splash