Replacing the API functions provided by Steven.