More reorganisation for john