add more actuators
merge resolve