make necessary changes for our device in common