Latest build with more error handling and comments.