Updating sender code and documentation v1