add back some logic from Wolfie