Some syntaxs changes