Changed logging...
Revert to jennifers code