Resolving design issue

Resolving design issue