Final corrections before submit -_-