Improved based on feedback from review (2nd round)