Addressed feedback from Justin Mason.