Several changes(