changed function arguments
updated analyses