reorganized solution structure