Prepare for the final commit