Restructured Code for 1.7.9, Additional features are broken