Preliminary fix for updateWidth - needs more DRY