changed names of files, added code to load values