Updated this
Improved Logging