Add new feature!!! Yeah!! I did not write test!!