FIX - Launcher simplified