merge some code with enigma code