#1 Current state added + titles for other parts