updates from Chen - version15