fix bug, and add some placeholder