New/old files
added some functions
added final functions