Merged with Yupeng's added code and tested. Everything functions as it should..
Merged with Yupeng's added code and tested. Everything functions as it should..