Dev/davide barbieri/working on new feed