Evolution of ELMs, pedestal profiles and fluctuations in the inter-ELM period in NBI- and ECH-dominated discharges in DIII-D. (13th April 2021)