Updated organization based on Adam's tables