Added Leader Logic and In Place Editing