latest changes to extract features