Finish to fix everything