Not sure
Move Batch changes to Launcher