final code changes for meeting 10-01-2014