updated view for better cod estyle