Fixed initial conditions code