Added world=self.world where world is used