updates for 2.3