Optimisation and internal reorganisation