refactored equipment_controller 2