tidy up and feeds v2