Changed solution structure