changed oldImplementation back to false