Made some major changes