Finished up custom conditionals for handling of message