rework for shell action