renamed (simplified) some API calls