Reorganized cover a little more