Added option for width