some little modifications