Expand market solution

Expand market solution