This is my update on current structure development.
I will be looking for entry on two levels as marked on chart.
Please be aware it still can breaks lower trendline and make additional two wave before breakout from triangle and labbeliong of d and e wave would change accordingly.