Added working version of all states and pillars