update to draft 2