Added changes for Leave