more updates based on the feedback from Sawyer