working on resolving