Updated syntax function and TODO