upgrade to 3.6