reorganized cypher stuff