Resolver reworking