few little modifications...