updates to meet Jon's reqs