Better (part 3), but still not perfect