** Added more logging