Critical Reforms

Changes needed now!