Update to 3.20