updated for new devices