Changed to better reporting of messages