fixed params and made it more all the same way