Yesterday
merge from horsepopulation_primitive_fix