#91 Yet another design modification