Improved demographics. Period is a param now