changes to support 3.1m5 changes