Improve the latest enigma script. Mostly done no.