rework for new client