incremental; refactoring claims