Changed way of using params