integ [finalized fixes]