minor updates by Duc