removed enhancement code