(tentative) final push before P5 checkpoint