Fixed #6 and optimized descendants based indicators, fixed later section