FIrst modification for shinken 2.0