Fixed up extract features