all working and started optimisation - 24/04