add back device/sample