big commit with bases prepare