__Merging updates from Carleton