changed pop related calc lists to dicts