fix dependency errors, change calculate_feature to return feature...