Correct view and some checking were added