Restructured the system