fix some bug version 1
temp version1