Updating the delegate; some regressions unfortunately