Updated TOODs, added logging