slight re-arrangements