Add launch parameter back in
More refactoring