adjust for possible furture devices