lots of changes, ready for simulations