demographics/age tracking code changes