More refinement and removed 100% whole width from base level mq