Got rid of device width