Added more Logging