Still mulling over #21