updates as requested, pt1