Revert most back to stock, just to test some thinks