removed emotion views
some changes!
some other changes