Updated Voice and Error Checking