Update for review feedback