Accomodate reviewer requests
Replace return_vals with return_changes throughout codebase