updated with new feed-api merge