While resolving (8/21)

While resolving