#221 evil upgraded