Changed views and stream file
replaced models