updated solution structure