Updated with splash screen