Rewrote section
Resolved caching issue
Resolved caching issue