Modify running logic