Redesign Feeders, close #936