V0.74a - Reorganized to unit solver for each sample