Protocol modifications to stick to the one defined by Tomasz Los