Add Boolean to reset PF at end