Added changes made on the 3rd and 4th.