added other content to visibility and error handling