refactored equipment_controller
merged