upgrade to tidekit