state transfer done
need to fix ui