minor changes in API