CHANGE: optimization of activityDiagram