Another attempt at fixing interfaces.