I think I have finished fixing it up