major syntax upgrade