This has been updated to use the interface.