changed input handling for equipments