Revised SotA section plus some minor changes
Resolved merge conflict