updates after first review feedback