Reorganized to make more better