add Enha and minor fix