Put back some code i accidentally deleted