Further solution reorganisation