Convert to tabs, add some comments into bulder