Improved modify