Execution flow save + Cyclic detection + a leak fixed