Simply code to use the new api.
merged