requested changes by @alkemist