updates after comments