Enigma remodel