Made more changes on master.