Prelim hacking on width support - add only at this stage