some more last minute re-arrangement