Include LeavePLabelOut in refactoring
A further refactor