Round 1 for suggestions addresed