100% finished and checking something needed

Re-edit