a littile modification