Implemented new syntax, still testing