Worked on improving state