some improvenments...