some re-arrangements