Minor Modify