Do you want an incremental patch with both changes ?