complete some function
Merge https://github.com/snowshana/Who-stole-the-wig-from-915