Address ongoing discussions in #36