Adding in parameter name instead of prompt
fixing conflict
Fixing the --new parameter and prompt if nothing is entered.
fixing tab conflicts