Add new feature

manual test passed