still working on feeds changes