update after review feedback