updated with Fangjin comments