PR Review #2 Follow-up