a little modifications