More reorganising and conversion