Update to create subset for matrix creation