Reworked feed + fixed bug