Change everything to depend now on the four parameters