added updates made w/ James on Thurs 6/6