I will leave it as it is cause then later we can do it all together instead of looking through each file and see which one is done and which one still need fix