More logging added