fixex & conclusion
again try to finalize