Changes to cypher gen stage 1