Updates and re-organization to make it easier to digest this information