Did some major changes