Fixed our misunderstandings