Added error handling
Changed so that we can display different levels of completeness