Added more logging statements