changes based on code review feedback from natasha