Commiting changes to improve modify team and fix a bug that must occurred in transfer from VM to my local machine