few little modifications