Included first changes to the messages file