Added hacky Device nastiness