Vishal #721 fixing param names
Vishal #721 refactor