Reorganised interface.