updates for 2.6