Changes based on Mark's comments