may have to revert this. Lots of width adjustments