Cues updated and now work with shortcuts