Added some more messaging
A few more calls.