Tweaks in feeds model