improved device table