working on Brian's comments