Updated extract so that it doesn't overwrite changed values
Updated version