Changes to support 7-2.5