Reorganization, turned off debug.