Updated with voice recognition