Changes by casumo