remapped leader and faster saving
merge