update based on other comments