minor changes, added initial conditions(not working)