address @wasade comments