Updated files from project 2 to match project 3 specifications.
First batch