integrate feedback from @yakky