added multiple views and more error handling