Modify to make use of name param.