Fixed Vanda's Errors