Added more logging
More logging changes