more changes for LUKE!!!
Merge branch 'feed'