Several changes before submitting