Updates based on Andy's comments