Modify and polish