[DG,SR]{refactoring] R9 - work you silly thing!!!