updated from the latest version and added 8check specific changes