Make sample_device better