intermediate commit, since there have been quite a few changes