Made some preliminary changes.