Big update following internal review