initial updates for 2.5