Last changes for the final