indicator display is handled separately now.