Adding some major changes.