Re-commit of changes to Flexible Society-

-story.ni  Please close issue https://github.com/Nuku/Flexible-Survival/issues/1158 if you pull this.