fix of year ordering and optimisation of controllers