draft protocols and upgrade Makefile