2 changes for mlaunch