refactored the remaining feed module