Updates messages
Following review with Rob