Updated version of some of the files