new version, removed unnecessary files