Changes according to trevnorris' review