update to use javelin 2.0.0