Rewrote section
Minor changes