Fixing Evan's errors -.-