reorganized interfaces