reorg and add leader shortcuts