updated view to be more fool-proof