Updated and Documented