Rewrote section
Bug fixes