Changed parameters slightly