updates for 4.x.x