Changes according to John's reviews