Commit #3

Made some more changes.