modified server-to-client grammar