Get back some useful code accidentally deleted...