add device info check
change content to table