Added More Logging