improved resolving