updated from review