Boss, please merge

Use this, refactored stuffs.