FIXED DAVID'S BAD PROGRAMMING