updated resolver