Slight modifications to protocol