modifications, removed points I think are redundant