Updated to address comments from first attempt