Neat border
Rewritten time step algorithm