updates for 2.6.1