draft of extracting changes on method level