Updated to allow for flexible width