rework for new descore