Made minor changes to remove a warning message and select appropriate parameters.