minor changes to the API