full update of latest draft