updated for other devices