Launcher tool & Code rework