removed compability with .data types
added feature selection