Changes to try and make the feed work better