Update to 3.5+