Added some parameter stuff