Made some revisions