Added ability to skip user prompt