intermediate commit - several things failing