Jontron/Darkman edit