Rework action with target and implement 2 more