added files from tested version