Some parts restructured