Incorporated Minh's Changes and updated the project