Change leader to , and made changes for buffer workflow