tweaked the messages to use objects where possible