Committing some major changes