Resolving active client…

Additionally