Implementing device support
tweaks