Add more stuffs

make it work