Restructured.
fix