update to support 2-6 -> 3.1