Rejigged solution structure