slight re-arrangement