revamped device handling