Evil added
Minor changes