Replaced some of the files with correct ones thus fixing the previous errors