merge sergiolepore's modify