Changed/Fixed for using with swiss rangers