Most/All of the changes made to incorporate failed messages