This commit extends upon 25de36d1eb38af4f682014d012ac0b41653c626d