My second modification