modify based on comments