re worked how syntax was handled