Commit #5

Made even more changes.