Added extract_change code