Update based on Mark's comments