change solution structure