Improved interface.