Added some changes to the input params