Update files in the 'chris' branch