Enhance design
Add enigma