Put back some comented out code