master: 87521c75bcfc83051c01d5d4c7818c38d6d924e0 more notes