revert more needed code