Incorporating feedback from @kxepal