Improved protocol a bit