updated with Voiceover support