Reorganized a bit, privacy upgraded