Cleaning + adding some information to improve the protocol