fist
it seem works
fix some bug