lates changes from review