added multi-gauge support