many changes

11