tweaked again, even more diabolique