Introducing new syntax, eliminate some logic