Update based on Kyle's comments