Report reorganisation, adapting to 2D complete