Changed some paramaters to more common