Modify and fix all.