updted cypher and geoff grammars