make some enhancement