Address feedback from @lizlux