pulling Zhe Shi's change
pulling Zhe Shi's change
merging with sean
merging
merge
merge
eror handler and cell test done