improved draft
further protocol improvements