Re-adding some stuff commented out for debugging.