Update to version 3.6