add isLeave as a temp solution