fixed all SO hirarchy