fix all stuffs that we misses (NEED TO MEET HIM TO GET SOMETHING..)