Integrate JiGe's  work, fix pulling ramen part

Integrate JiGe's water and noodle, fix pulling ramen part