Additional changes related to partial results