Updating Matt's update of Aaron's work.