Uses states now, still doesn't dig