Change script in order to include the User inputs