Some improvenments