major syntax overhaul