Restructured to make it easier to read