Several changes: