Restructured the update