changes to handle multifeature data