major fix, different strategy