address 2nd feedback and review