New protocol almost working