drafts reworked to new layout