new changes fixed some bugs

new changes fixed some bugs