Few words about states + other modifications