add newly necessary unwraps