Critique added by @cbadal