Added States and adjusted formatting slightly.