Commit before cleanup of legacy
Updated to latest feed api changes