Modified notation
Fixed merge conflict