Rework on SimpleSample.fx