Refactored oxforditc503