implemented feedback by @GeeH