Put back in some code I should have not taken out