Modified more stuffs