minor enhancement (both interfaces)