its working FINALLY
refactoring params
refacotring params