Just some little modifications