Update #467 based on feedback

Closes #467