Final version
Replaced all the old broken files with the new