merging Ross changes