Now uses ExtraTricky's measurements