States and small final changes from me