now that we redefined out token groups, we need to make the expirations match