Steve's changes to sync with Sesar