Added controls on initial conditions