Restructured GET to use consolidated calculation method