Added states, commented }s