Changes for submit to Prof. Yong Oct 9