UPDATED FILES AND STUFF