changed files in branch TJDevelopment