Update for debug and fix bug in launch