Added the population state scheme, passes lint