Reorganize and test new idea