improve Evil support