Added even more logging
Pulled in Krisna's change