working on new resolving