ST Diagram and minor changes

ST Diagram and minor changes