tightening up draft version