up to date changes to let the expertiza run without refactoring