removed gunth, some changes to view