Final Commit With addition data and fixed names