refined issues but some problem doesn't fix yet