addresed CR feedback