Almost finish modification of local feature extraction.