Add new and re-arrange Fire section issue #39