made some major changes