some enhancement changes