Upgrade to decent version