Changed where width read happens
Fixed a serious issue with conditionals