Made it re-work with the new API.