Reworking Toshko's implementation of the project protocol