Restructure point 2