Updates based on 2nd round of feedback and discussions