Grammar and link changes