Second try at committing everything