Modify logic