- Also added dynamic W width calculation