Feature/ronakmdave/improving feed