resources restructured and optimisation