Here is an updated structure based on my view.
Comment:
Comment:
Wave (c) and Y completed?
Comment: