Reorganized and Commented