Updated for feed fixes