Added feature selection in theory