modify resolve and deresolve