Hanh Le - Synchonized with previous version(on laptop)