Addressing @wasade comments