final version, more files added