1. Check in Khanh's source code for applying Khanh's proposed solution 
2. Overwrite previous development work