TNO Intern

Update after java refactors