Could this be moved into the `resolve` block?