Using latest sender lib
consistent wording on the comments