update based on comments