Updates based on feedback from @nicklewis