[Added] more changes from The Project.