applying feedback from @simon2k