Restructured update to be easier to understand