Just little modifications