standard updates for 2.5