fixed Eric's errors