Reestructured to be more like to the original