Minor rework on the ichimoku class