updates as requested, pt2