Bruno's general source code changes