Uncommented some previously commented out code