changed it so that it uses the new syntax