updates for v2.5