Add coloring curves & adapt experimental setup