Added to take note of number of features