Merged more stuffs