latest updates to adjust for width/space