Added ability to change input parameters