PR Review #3 Follow-up