more changes based on comments