Attempt #3 - Correcting more errors