anishek/dileep | first set of changes for feed