upgrade to trunk