adding better messages