put back some overwritten code