changes based on feedback by @ngaranko